From 389307eb2c71f9654077aaecd9bc6cb8fbb01c4b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 18 Oct 2017 09:40:53 +0800 Subject: [PATCH] Install separate render node test for cairo and vulkan The vulkan test currently fails. --- testsuite/gsk/meson.build | 8 ++++++-- testsuite/gsk/render-nodes-cairo.test.in | 4 ++++ testsuite/gsk/render-nodes-vulkan.test.in | 4 ++++ testsuite/gsk/render-nodes.test.in | 4 ---- 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 testsuite/gsk/render-nodes-cairo.test.in create mode 100644 testsuite/gsk/render-nodes-vulkan.test.in delete mode 100644 testsuite/gsk/render-nodes.test.in diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build index 218439e65c..7b932d3f7b 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build @@ -62,8 +62,12 @@ test_data = [ if get_option('install-tests') conf = configuration_data() conf.set('libexecdir', gtk_libexecdir) - configure_file(input: 'render-nodes.test.in', - output: 'render-nodes.test', + configure_file(input: 'render-nodes-cairo.test.in', + output: 'render-nodes-cairo.test', + configuration: conf, + install_dir: testdatadir) + configure_file(input: 'render-nodes-vulkan.test.in', + output: 'render-nodes-vulkan.test', configuration: conf, install_dir: testdatadir) diff --git a/testsuite/gsk/render-nodes-cairo.test.in b/testsuite/gsk/render-nodes-cairo.test.in new file mode 100644 index 0000000000..3860baf4bd --- /dev/null +++ b/testsuite/gsk/render-nodes-cairo.test.in @@ -0,0 +1,4 @@ +[Test] +Exec=/bin/sh -c "env GSK_RENDERER=cairo @libexecdir@/installed-tests/gtk-4.0/gsk/test-render-nodes --tap -k" +Type=session +Output=TAP diff --git a/testsuite/gsk/render-nodes-vulkan.test.in b/testsuite/gsk/render-nodes-vulkan.test.in new file mode 100644 index 0000000000..2c91ecdc06 --- /dev/null +++ b/testsuite/gsk/render-nodes-vulkan.test.in @@ -0,0 +1,4 @@ +[Test] +Exec=/bin/sh -c "env GSK_RENDERER=vulkan @libexecdir@/installed-tests/gtk-4.0/gsk/test-render-nodes --tap -k" +Type=session +Output=TAP diff --git a/testsuite/gsk/render-nodes.test.in b/testsuite/gsk/render-nodes.test.in deleted file mode 100644 index 01f2a50179..0000000000 --- a/testsuite/gsk/render-nodes.test.in +++ /dev/null @@ -1,4 +0,0 @@ -[Test] -Exec=@libexecdir@/installed-tests/gtk-4.0/gsk/test-render-nodes --tap -k -Type=session -Output=TAP -- 2.30.2